Auto merge of #1531 - alexcrichton:cargo-version, r=brson
authorbors <bors@rust-lang.org>
Thu, 16 Apr 2015 23:05:40 +0000 (23:05 +0000)
committerbors <bors@rust-lang.org>
Thu, 16 Apr 2015 23:05:40 +0000 (23:05 +0000)
Closes #808
Closes #1178


Trivial merge